# HG changeset patch
# User Chris Cannam
# Date 1444830741 -3600
# Node ID 2e3d388489e5d881bb96c9ae038915ea8bf05d09
# Parent  89f44d182d379d5555954093016d32948db16b53# Parent  5fdf5cd032acfe2f31fcd1c35b174ddb3521db15
Merge from branch "3.0-integration"