Upstream PR #527

Paths should be protected with quotes in case of spaces