Merge remote-tracking branch 'upstream-restricted/pr/457' into mbedtls-2.1