Not to be merged into master! Updated gunicorn and added timeout.