# HG changeset patch
# User Chris Cannam
# Date 1423649028 0
# Node ID ae8145b28b2b9209b23b8f177eae574de085917d
# Parent  df5b75a95193302e47dd6d7a4958e25cb53b4908# Parent  83a2227efc710fa3c2e5eafeb320802f0ecf7454
Merge from live branch