# HG changeset patch
# User Chris Cannam
# Date 1541494737 0
# Node ID 5f9c9d8c3de68ac03a6ab469badb80086954b754
# Parent  2fec0d9bd7ac1b4b6f0890b2dbe6ac090678632c# Parent  175ef02c7864d91a22f8458d1c0ac922d2314682
Merge from default branch