# HG changeset patch
# User Chris Cannam
# Date 1435324725 -3600
# Node ID 2363196deed789326c23c49ffe08a72cabe827df
# Parent  8d45d6412ca6338adcc532cbfa5dd194d367ef21# Parent  fc742cdbf2b94d38633a0c63fe7ea348738b2e9d
Merge from branch normalize_hybrid_option