Merge pull request #164 from mikeh/master

MOBSDK-611