# HG changeset patch
# User Chris Cannam
# Date 1403007398 -3600
# Node ID 8b631ce73b1c7f28df545190bc42e1d7271f39ff
# Parent  8d7f39df44edefb923903325ea0e813004953d86# Parent  e7a3fa8f4eec7c85ab80e5b1ddab1e2a60633c2c
Merge from default branch