# HG changeset patch
# User Chris Cannam
# Date 1558083772 -3600
# Node ID 42c87368287c0c0e7882e71472443f99f7fa9da9
# Parent  8d5bf4ab98ef22d646cf093eea47b439218eb6a2# Parent  009f22e03bf6b4cb6eade4a11b2b6eb0acb9e6f3
Merge from branch single-point