# HG changeset patch
# User Chris Cannam
# Date 1444814364 -3600
# Node ID bfe468c89d30c0fbd8216e055b22cc62d70b1545
# Parent  d1c70c680fa920fe200304add821442a553683de# Parent  c82cae9a9e74724379e6027459efae20492d2256
Merge from branch "3.0-integration"