Merge pull request #335 from gavincornwell/master

MOBSDK-832 & MOBSDK-833