Merge "Added support for https"