fix for new backend changes. Pass forward slash on Unix, backslash on Windows
Merge remote-tracking branch 'refs/remotes/github-nosami/master' into develop