# HG changeset patch
# User Chris Cannam
# Date 1484303395 0
# Node ID b2d49e7c414951b5611f2f43534edbb754ee8d59
# Parent  d65ce7e553469e65be564a2168f42d45ba1135a3# Parent  8cc291b13f2b0d3e907585706c56247f8c9889ae
Merge from branch 3.0-integration