# HG changeset patch
# User Chris Cannam
# Date 1401790457 -3600
# Node ID e88a15c25a4a5323be1b339c03218c9a1001d0f3
# Parent  d75c9e0d5e7e06836f81bf9208e9891de5bbcd33# Parent  49618f39ff091e72eb94dd0d8424da44cf10e272
Merge from default branch