# HG changeset patch
# User Chris Cannam
# Date 1444830766 -3600
# Node ID 9a125d1c8a2254411fa4fb27ddc45d1918ab469f
# Parent  bfe468c89d30c0fbd8216e055b22cc62d70b1545# Parent  39e94df71d24b92f30f8215cb542d6e481e42281
Merge from branch "3.0-integration"