Merge branch 'rp/link-curl-before-ssl' into maint