# HG changeset patch
# User Chris Cannam
# Date 1525357454 -3600
# Node ID f90a3c2f2930e8acd2dfef09a0951fdfc9ed48cb
# Parent  a04f1012fca202cdf7df41d5df6d58464e0fa4bf# Parent  fc9d9f1103fa79930c66455cd620ada16043b164
Merge from branch horizontal-scale