Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint