# HG changeset patch
# User Chris Cannam
# Date 1476346144 -3600
# Node ID e32815f133d625497dd030c76b14a9976d5c4a58
# Parent  43762dba6747261d8a0132a4f28ec07393129545# Parent  7cf38d7ad81db97378ba60306f846d5cb0434094
Merge from default branch;