# HG changeset patch
# User Chris Cannam
# Date 1531475073 -3600
# Node ID 3a510bf6a9bc9114d9b458b2f119b33b726c2ae8
# Parent  fb03674bdde17965f132f4615e84f82418b3e430# Parent  3585a1b16dc3dafb90f97aa4378186671856e59a
Merge from live branch