Merge pull request #271 from mikeh/master

MOBSDK-708