Use filtered file paths in upload (fixes #2836)
Merge pull request #2837 from chillu/pulls/2836-upload-filename-filter

Use filtered file paths in upload (fixes #2836)