Using $host instead of $server_name for redirect HTTP to HTTPS
Merging changes