# HG changeset patch
# User Chris Cannam
# Date 1484303390 0
# Node ID dc2af6616c8389ce559d36ef8b27671ced2f3db9
# Parent  e8102ff5573b5d89c54da4a92b9c7fbd1a27962b# Parent  c603aba6170202ae759e99c09390eb4b640f8003
Merge from branch 3.0-integration