# HG changeset patch
# User Chris Cannam
# Date 1498559450 -3600
# Node ID 1f4fb4a0f62aad2cd7a7dad98222678a399408b6
# Parent  e64981b88943aaf2c57244d0cc0f3169c5237e21# Parent  434be2f0509e1096fc7693c79666db6b7c8b53d8
Merge from branch output-type-uri