# HG changeset patch
# User Chris Cannam
# Date 1413274831 -3600
# Node ID 45480b73f4af9cf216d939b28b454631b9c0178e
# Parent  6b62bae0af33ffdb6db23ed1a2da2318e702b52e# Parent  b3d73c08b6cefe4c98777d0c0381dcbac6e99c40
Merge from default branch