# HG changeset patch
# User Chris Cannam
# Date 1405678050 -3600
# Node ID 5f7b509a441a518ecda57da7ba804f3d6f281bdb
# Parent  178ffa964096f32ace219b21e0fb2e7e71bde1a2# Parent  6d2ece0fe35637968428395746cdac60f7d687e5
Merge from default branch