Change settings for production.
fix for production.
Merge remote-tracking branch 'origin/master' into web_server_production
Adjust web_server to latest production.
Merge branch 'web_server_production'