# HG changeset patch
# User Chris Cannam
# Date 1474359415 -3600
# Node ID 0d04b1cdb9f9c98403af5bdd87352379de52a7d9
# Parent  1badacff7ab28e03904c71fe7609407e53bd2fbb# Parent  c0d841cb8ab957816c44ea1a881bb778eea22f49
Merge from branch tony-2.0-integration