Made a special idp version compatible with uwsgi/gunicorn usage.
Merge remote-tracking branch 'upstream/master'