am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host * commit 'a6ca0a6b': DO NOT MERGE Add a delimiter between scheme and host