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

* commit 'b7787a317fc8bb163de04641a1423cd08324d4b8':
  Add a delimiter between scheme and host