# HG changeset patch
# User Chris Cannam
# Date 1474359373 -3600
# Node ID fef49844b3f8184b64e289352b3eca7b6642a8df
# Parent  d60f9715ba78d96934d769b670c6bd8130b82b2c# Parent  16955f929d377f80412f86f7f51e104749993d38
Merge from default branch