am a770f8d4: Encode characters that java.net.URI rejects

* commit 'a770f8d4bd583e9a719af6ce314838db12003b33':
  Encode characters that java.net.URI rejects