# HG changeset patch
# User Chris Cannam
# Date 1477664458 -3600
# Node ID e59e66d8208d89f38c8cfda0a29cdda48056b32d
# Parent  8d873a022873d0f0bae885471c23d654cf070d1c# Parent  227291052aa9359633ca9183328daf3daaed0d7e
Merge from branch piper