# HG changeset patch
# User Chris Cannam
# Date 1518104433 0
# Node ID 8742125177aeaf009a1ec45817a06199b82fc97c
# Parent  d129bf797f24a37e64d4fc189e2bb7be351bc576# Parent  70e52a6d7e99322f4cb9ec40e1659e46057fdbb1
Merge from branch vamp-kiss-naming