more path handling
Merge branch 'release/1.0.13'