# HG changeset patch
# User Chris Cannam
# Date 1558001267 -3600
# Node ID 1e7b7a62d3737d199c9b8c20f4c5f084f7d88f71
# Parent  28f9ff7864c6c127a60098ee3144a35e0db59b73# Parent  5d4831c2e8aa94fd73cbfa28cc09720675b9b9ab
Merge from default branch