Added HTTPS->HTTP redirect for production server
Merge remote-tracking branch 'upstream/master'