# HG changeset patch
# User Chris Cannam
# Date 1412196355 -3600
# Node ID 158d059d9a4cfec88aee9b2ed8b81e91c3d380ed
# Parent  260024e62b6b2be94f63c25395bc8e8d141862e5# Parent  28831a538cb5cd176e01e84eadfb54e850f04add
Merge from branch 2.4-stable