a bunch of https's
Merge branch 'hotfix/3.6.11' into production