Merge pull request #1356 from smortex/fix-ssl-rewrite_non_www_to_www
Fix rewrite_non_www_to_www when using SSL