# HG changeset patch
# User Chris Cannam
# Date 1541494748 0
# Node ID 146dbfac36a3762d213cd89e9ef07d734ae4d5b2
# Parent  7eafe977a1fc8ae71030d1744d9c6e8559a92066# Parent  ca64cc9047d0b5ad17dfd224a09416886206beb3
Merge from default branch