Also check X-Forwarded-Proto when behind a proxy to see what the protocol is
changelog
Merge branch 'pr/1015' into devel

Fixes #1015