# HG changeset patch
# User Chris Cannam
# Date 1395046557 0
# Node ID b1f6665080fda2635866cff0582592af9a0ab7d1
# Parent  020bc7fe7a2a47783ead0b622ad547a546058ee9# Parent  f67d6e387088160960f7d056cb36f94f0761096a
Merge from live branch