Uploading files via URL: fix for URL parameters (eg. image.png?id=343543)
Merge remote-tracking branch 'upstream/master'