Merge pull request #297 from mikeh/master

MOBSDK-758. MOBSDK-759. MOBSDK-760