# HG changeset patch
# User Chris Cannam
# Date 1415611233 0
# Node ID d62a622a0e4077252c7d5e786986df8ca59e83ad
# Parent  c1b2b8b841655cce8c72a02d3f47c88e73341cfc# Parent  7b2dd0d4c366057ce25547a4015f3a76981abedc
Merge from default branch