Force SSL in production. #1422.
Merge branch 'master' into production
Merge branch 'master' into production