# HG changeset patch
# User Chris Cannam
# Date 1528724436 -3600
# Node ID 91670e4e76a6191c0dda0cf61d9740cb7f75cd38
# Parent  51e6125627fac189f3c57fcc4d960a0841a21380# Parent  f24f64e441ac83e0e81da3a66d04d3396f16fa76
Merge from branch plugin-path-config