Merge pull requests from mbedmicro/master

Sync with master