# HG changeset patch
# User Chris Cannam
# Date 1478009337 0
# Node ID c401e738793f2de89d7b63a7948c7831966a44e6
# Parent  dd49630e0d7070276e33465db43269363df06c18# Parent  c6bdf247016a9f264a05082f9725b93171d17dac
Merge from branch 3.0-integration