# HG changeset patch
# User Chris Cannam
# Date 1477664458 -3600
# Node ID 8a5f0c8d56089170062e94c70f369292b06a6c12
# Parent  fc00a06feecd038ab4de63853621a82589b6243f# Parent  8e4b90aeefaa58a1744f0291768ce03e1652f3a1
Merge from branch piper