# HG changeset patch
# User Chris Cannam
# Date 1410276981 -3600
# Node ID 6e6da0636e5e4f143daeebac0c003f1dbe316436
# Parent  35b05cac32d0cb96080316cc36f852c83cc3bb18# Parent  c598b1d880f2a58282a64e27248cc0313a4605cd
Merge from default branch