auto-merge staging into master
Added CloudFlare SSL support