# HG changeset patch
# User Chris Cannam
# Date 1379407894 -3600
# Node ID f019ad7fcf1be80ed4dc55a9238edd01770ae429
# Parent  7c0909052511a3d3f1932f4c85ffd109f190ed24# Parent  ac411172d897beffb10e14d38475f82e03531976
Merge from live branch