# HG changeset patch
# User Chris Cannam
# Date 1525357446 -3600
# Node ID 45519a9836e68d0517a861e1927f4b768590d0d1
# Parent  0fb5d4e6edeb7ea21d9827417fa11fa72055de19# Parent  9528c73aa98c6f0724922d2d5fc86f7710e81e8f
Merge from branch horizontal-scale