Merge pull request #296 from ARMmbed/polarssl-1.2-restricted

Merge of polarssl-1.2-restricted