# HG changeset patch
# User Chris Cannam
# Date 1519290283 0
# Node ID fb03674bdde17965f132f4615e84f82418b3e430
# Parent  4e21f91ad4ff7f25123f97ecc4fc86c9fb10a5a2# Parent  5584bee75daa655922f6697fd59924b9e419e5c8
Merge from live branch