Merge branch 'pr_1544' into mbedtls-2.1-proposed