am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '8f87c5d8d270bbc23738aea067b1bce2b7d08d02':
  Add a delimiter between scheme and host