Merge pull request #92 from gilles-peskine-arm/psa-api-beta2-merge-development

Merge development into API spec branch