Convert URL to File using a URI so that URL-encoding is removed

Fixes #1429
Merge branch '1.1.x'