# HG changeset patch
# User Chris Cannam
# Date 1447848513 0
# Node ID 1309b66eff5372e435ebb12b8629b60221548fe4
# Parent  f8604a7c46606d2c09d03f4124b01908a0a5e373# Parent  6d550a16f7d69410eafe759fee2d3e7d0aefca7b
Merge from default branch