# HG changeset patch
# User Chris Cannam
# Date 1410276981 -3600
# Node ID c1b2b8b841655cce8c72a02d3f47c88e73341cfc
# Parent  08a45e4cf1b150a44a0bd2610151d9ceddc2a41f# Parent  7709bb9a11306752380c46968b82370b16932567
Merge from default branch