# HG changeset patch
# User Chris Cannam
# Date 1478097317 0
# Node ID 607ef6635f3b73fc9749c3b0cbc98285a3bbb4e6
# Parent  b8a3de18f1c1b444e2ab898d07b0652837976f85# Parent  9d6e99d707447a5b788664cefd2fc0e26468c533
Merge