# HG changeset patch
# User Chris Cannam
# Date 1493968750 -3600
# Node ID 6ad57ce693cb3d8e85de4b0ce0ec9746f33ef350
# Parent  0f389bfb0905974ace4853b28e2b5a54cafe9bac# Parent  5323074dda37d195e3ed6046ebb629d068d1183c
Merge from branch scale-ticks