Added support for servers behind a proxy.
Merge branch 'develop'