# HG changeset patch
# User Chris Cannam
# Date 1436170521 -3600
# Node ID ad45b18427e0d29475d20edecb6bf04291732a48
# Parent  fa2ffbb786df5bd0c699aa26a670839607da9999# Parent  705d807ca2ca1de8952491bdcf9dbf1a2aff8d67
Merge from branch livemode