Make ensure_http not conflict with https.
Merge branch 'hotfix/1.5.4'