Merge pull request #165 from mikeh/master

MOBSDK-612