# HG changeset patch
# User Chris Cannam
# Date 1476111160 -3600
# Node ID 7cf38d7ad81db97378ba60306f846d5cb0434094
# Parent  6ac615fd02a3606dd07ad9375c6c5372874a5d87# Parent  43762dba6747261d8a0132a4f28ec07393129545
Merge from branch vampipe