# HG changeset patch
# User Chris Cannam
# Date 1478271423 0
# Node ID 47db3b8f406360cbcfd7bef087ccf893b3c1c0e2
# Parent  e59e66d8208d89f38c8cfda0a29cdda48056b32d# Parent  9d067d65fe3f94033f5e4c80fc2f4475d484f556
Merge from branch piper