# HG changeset patch
# User Chris Cannam
# Date 1480673084 0
# Node ID fd4a6183482f9e08ad5f48339cd3679e45cb9ba8
# Parent  9e7d180be225a3819845ba23510edda2af8c5d6c# Parent  bd6e98b348cf9c5fc7f4315a0e0e11912408f3e9
Merge from branch piper-nopiper. The next release will be based on this.