# HG changeset patch
# User Chris Cannam
# Date 1415611189 0
# Node ID ba404199345fa3948e7c5aa33aaf7cdbd8904cd6
# Parent  6e6da0636e5e4f143daeebac0c003f1dbe316436# Parent  d954e03274e84ecfa1d1e6a4600e96497d5ad53d
Merge from default branch