Merge branch 'jc/maint-no-openssl-build-fix' into maint