Merge "Enable http-live support for https:// urls, fix a parsing issue."