Merge branch 'win-tests-1.3' into mbedtls-1.3

Backport of PR #353