# HG changeset patch
# User Chris Cannam
# Date 1400057907 -3600
# Node ID 36efd75d7b7b1bb88dbe6c15992b1ffe3e40d452
# Parent  63dec7dc11cc9edf74770268bf617619c4f5b3c8# Parent  aebee52e86b3b7c234667e6817101f331d6a09e8
Merge from default branch