# HG changeset patch
# User Chris Cannam
# Date 1528735610 -3600
# Node ID 3ccc384c01619bb9a1ce2a83fd08b8af8d2f4e3c
# Parent  cf18645ff411a2b292946153109d499fbf69de9f# Parent  ae74d39e9e4e1adbe63679dc8b98c00c90aa0f33
Merge from branch plugin-path-config