# HG changeset patch
# User Chris Cannam
# Date 1474359433 -3600
# Node ID 1682dd81d0ef222d05861236e1fd47a5b4683890
# Parent  c3648c667a0bb9004c97f1997dca22b79c419e12# Parent  169aa5203faa0f1762961311e5bbe187df63fd16
Merge from branch tony-2.0-integration