Merge branch 'pr_998' into mbedtls-1.3