Merge branch 'hotfix/after_body'
Improve SSL detection
Merge pull request #116 from ffffelix/master

Improve SSL detection
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into develop
Merge branch 'develop' into 2.0