Merge branch 'mh/maint-honor-no-ssl-verify' into maint