# HG changeset patch
# User Chris Cannam
# Date 1558083763 -3600
# Node ID 978c143c767fbe5951ae7d8667aa4ca35137c3bf
# Parent  ab4fd193262b93410c0fe09175b4a1df43ed5753# Parent  54a954ee7529d9f419ba00d0d7e2324493b98683
Merge from branch single-point