# HG changeset patch
# User Chris Cannam
# Date 1381336932 -3600
# Node ID 303b9be118d40df9918acec5d0b485aa15325447
# Parent  f019ad7fcf1be80ed4dc55a9238edd01770ae429# Parent  04cc33a44d4ccadf075bfdac9d48e92d8144b9fa
Merge from live branch