Made enmasse handle relative paths
Merge branch 'master' into u/ixa1