Merge "Added HTTPS support"