Merge branch 'log_daemon_msg'
Merge branch 'gunicorn-envvars'