# HG changeset patch
# User Chris Cannam
# Date 1381480449 -3600
# Node ID 7465cceb8dfc72843cb1a9578ca387327ace974f
# Parent  303b9be118d40df9918acec5d0b485aa15325447# Parent  2b7911132501a1a81a8777a9d523703f139e18a9
Merge from live branch