Merge pull request #163 from mikeh/master

MOBSDK-582, 603, 604