Merge branch 'hotfix-x-proto-ssl' into develop
also add X-Forwarded-Proto
Merge branch 'hotfix-x-proto-ssl'