Merge remote-tracking branch 'upstream-public/pr/1337' into mbedtls-2.1