# HG changeset patch
# User Chris Cannam
# Date 1395046673 0
# Node ID 17c7ffe039b1b0ce738e74b36707501d0d1db962
# Parent  c86dacc2ef0ad26fecb52f481328ffcdffcd63e2# Parent  a5f2bdf3b486f00c6aa778ed8817eb22cdb5716f
Merge from default branch