Merge pull request #276 from mikeh/master

MOBSDK-711