Use uri in the implementation for java.net.URI, since java.net.URI gets hosts with _'s wrong.
Merge remote-tracking branch 'github/master'