# HG changeset patch
# User Chris Cannam
# Date 1556102731 -3600
# Node ID 21673429dba5b2036a83c26a096505903d3346b4
# Parent  06db8f3ceb95241e1a9ead20dbf1b12de39fea65# Parent  e19c609a7bec84855aa65805ae838b43bb71ac22
Merge from default branch