Fix #1307: File upload fails if filename has spaces in it
Merge pull request #1316 from mahagr/2.0

Fix #1307: File upload fails if filename has spaces in it