Fix problems with file:/// URLs #8969

Merged
merged 2 commits into from May 20, 2017