am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '25e150a2dd60a624ceecd5a5743a622fed32ef90':
  DO NOT MERGE Add a delimiter between scheme and host