# HG changeset patch
# User Chris Cannam
# Date 1401790474 -3600
# Node ID c1fc074971edd62d494a98f70da21d456a3e68fd
# Parent  bf0b419fdaac5e92ed5cfae5c448cf3e1f967913# Parent  ddae586bc47bbe718d625109065b06d11d23db8a
Merge from default branch