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