# HG changeset patch
# User Chris Cannam
# Date 1476110915 -3600
# Node ID b409560a805b09a830f1c489300039708e1dca52
# Parent  4101e3f80aa0f2b352577e85c9af1568bc290612# Parent  3949cc56f2ce00d6b7e51bc31a3186e6a138a18e
Merge from branch vampipe