Merge pull request #2488 from Xeli/develop

Add support for https behind a reverse proxy using X-Forwarded-Proto