Merge "Add support for HTTPS with self signed certificates"