Merge pull request #299 from mikeh/master

MOBSDK-762