...
Make up better URIs for local-file sources.
Merge branch '0.10.x'