Merge pull request #204 from gilles-peskine-arm/merge-crypto-development-20190806

Bring in changes from Mbed TLS as of 2019-08-06