# HG changeset patch
# User Chris Cannam
# Date 1480068532 0
# Node ID 3cde25cbe7f8d04de0b3668463b98f2b796247d1
# Parent  fa574c909c3db7dc9ef6f2294e100315553b0498# Parent  114de081a42d894400dbdcf4945d578b4c7dc8a3
Merge from branch subdivide-instants