# HG changeset patch
# User Chris Cannam
# Date 1474359365 -3600
# Node ID d60f9715ba78d96934d769b670c6bd8130b82b2c
# Parent  35387a99c236f91031de4a331593810889b210c0# Parent  659372323b45f19c5707942ef1c7cffb391efe82
Merge from branch tony-2.0-integration