Merge branch 'jh/mingw-openssl-sha1' into maint