# HG changeset patch
# User Chris Cannam
# Date 1499693065 -3600
# Node ID f683b191dbe6317bc2a09a863b280b6d9390dccd
# Parent  14dcdc596baf59adec3f8507c302e0424ed76de1# Parent  cdaeff1858af72b24f40b5799d8d11c495dc14f0
Merge from branch "scale-ticks"