# HG changeset patch
# User Chris Cannam
# Date 1478009337 0
# Node ID 9d067d65fe3f94033f5e4c80fc2f4475d484f556
# Parent  227291052aa9359633ca9183328daf3daaed0d7e# Parent  e59e66d8208d89f38c8cfda0a29cdda48056b32d
Merge from branch 3.0-integration