# HG changeset patch
# User Chris Cannam
# Date 1427105088 0
# Node ID c4898e57eea502546201700e773585e157641611
# Parent  ba404199345fa3948e7c5aa33aaf7cdbd8904cd6# Parent  682d64f05e72d0d83ae0c75a7a4962c0eb3bbeee
Merge from default branch