# HG changeset patch
# User Chris Cannam
# Date 1395046584 0
# Node ID cb53cb6eeaef109f408be44c3f70ecca15dc1a03
# Parent  bffab3762865fe7bea9397d52625318456f62fbd# Parent  b1f6665080fda2635866cff0582592af9a0ab7d1
Merge from default branch