Set OS environ variables in wsgi server
Merge branch 'master' into production