# HG changeset patch
# User Chris Cannam
# Date 1444813934 -3600
# Node ID f8604a7c46606d2c09d03f4124b01908a0a5e373
# Parent  0cb263a2f52cdb6b15cb141fc067d3e502a2a2cc# Parent  e994747fb9dd1c253c6b80cedabedadb4e54be35
Merge from branch "tony-2.0-integration"