# HG changeset patch
# User Chris Cannam
# Date 1465818396 -3600
# Node ID 218be6cf2d4f5e0b5861097a68338f63df24679e
# Parent  25b035362c44a4a402db1cc28fee137966cba326# Parent  b4fd6c67fce5bb3a71020ad825dddafae1265f0b
Merge from default branch