# HG changeset patch
# User Chris Cannam
# Date 1403005947 -3600
# Node ID 926f33d3a8b7d493e29a9e9a19614a2901351d21
# Parent  55e552b4f1b71ecc47d14a2e14dd0da4c387cde8# Parent  49618f39ff091e72eb94dd0d8424da44cf10e272
Merge from default branch