# HG changeset patch
# User Chris Cannam
# Date 1477664458 -3600
# Node ID 5261a7791f1c4c37bf88e116d9eab3360c641cb2
# Parent  a1b97df9962e0c39486748309bee4ad63a226157# Parent  dd49630e0d7070276e33465db43269363df06c18
Merge from branch piper