Merge pull request #130 from gilles-peskine-arm/psa-api-1.0-beta-merge_development_20190524

Merge development into psa-api-1.0-beta