# HG changeset patch
# User Chris Cannam
# Date 1478256267 0
# Node ID 8e846c1aed96189f020024cdadd0d37bf69d3e3a
# Parent  79a219ba617862adffd78925f1571e5c96760e0a# Parent  0545cd3f1738cb677fadd1672a6b6affaab84189
Merge from branch enumerate-options