Merge pull request #192 from mikeh/master

MOBSDK-631, MOBSDK-632, MOBSDK-633, MOBSDK-634