# HG changeset patch
# User Chris Cannam
# Date 1411721295 -3600
# Node ID df5b75a95193302e47dd6d7a4958e25cb53b4908
# Parent  c3edf97ea198438b54b7a4572626e57ed72211af# Parent  5047f066734d8d160ce5d395b5a02fa3fd42357e
Merge from live branch