Merge pull request #273 from gavincornwell/master

MOBSDK-694, MOBSDK-702 and MOBSDK-703