# HG changeset patch
# User Chris Cannam
# Date 1473860617 -3600
# Node ID 32c456e0485536774d2d93dee4d3b24f2a94f5e8
# Parent  8fdafb8f1c450bc931d0c904140fd33a4c01d587# Parent  d63f2ade049b88465d1e1cc3f4f4bb3b45bf57ce
Merge from branch process-noparse