# HG changeset patch
# User Chris Cannam
# Date 1410435990 -3600
# Node ID c3edf97ea198438b54b7a4572626e57ed72211af
# Parent  96ca535049b3c6d66d077d30f0c83734821b1759# Parent  fb9a134672536f194e476cbe2a6e89618dad7ff0
Merge from live branch