# HG changeset patch
# User Chris Cannam
# Date 1484303384 0
# Node ID 3382d914e1109e33c2fead4dc8eba898a1fb1807
# Parent  6a7ea3bd0e10e6d97bcbdbefb0cee4a7e9734406# Parent  b812df0351d99b5d7ca4de80ae728614adf68cba
Merge from branch 3.0-integration