Merge branch 'pr_1083' into mbedtls-1.3

Merge PR #1083 plus ChangeLog entry.