merge with upstream master

gunicorn_config.py

@@ -0,0 +1,13 @@
+"""gunicorn WSGI server configuration."""
+import multiprocessing
+import os
+
+
+bind = '0.0.0.0:' + os.getenv('PORT', '5000')
+max_requests = 1000
+worker_class = 'meinheld.gmeinheld.MeinheldWorker'
+workers = multiprocessing.cpu_count()
+timeout = os.getenv('TIMEOUT', 120)
+graceful_timeout = os.getenv('TIMEOUT', 120)
+keepalive = 5
+daemon = False