# HG changeset patch
# User Chris Cannam
# Date 1478271423 0
# Node ID 67aee57e32c87bb5cb5d3cb178812acc0f5bbc57
# Parent  c6bdf247016a9f264a05082f9725b93171d17dac# Parent  c2d66e3c83d03e2a7f90fd72e263d1ccbd3b5395
Merge from branch piper