Merge pull request #1599 from marcel-blonk/PLFM-3094a

make sure to url escape path components