# HG changeset patch
# User Chris Cannam
# Date 1457095218 0
# Node ID 1040d7d70eca8b04409e804694b43d52e24142c3
# Parent  38b09e4a2121d6a1e8567b323df2d7313f69df96# Parent  a1180a2a522034ff7e22a561aaf306f81bfdacb0
Merge from default!