Merge pull request #332 from gavincornwell/master

MOBSDK-828 and MOBSDK-818