Merge branch 'pr_1045' into mbedtls-1.3