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