# HG changeset patch
# User Chris Cannam
# Date 1401377272 -3600
# Node ID 5a66f4e5a3dcfe3e80211176bf2e8d90965e63f1
# Parent  36efd75d7b7b1bb88dbe6c15992b1ffe3e40d452# Parent  1d8cb0d92f4bb14231684f29fc329524f1aa065c
Merge from default branch