Added CloudFlare SSL support
auto-merge staging into master