Merge pull request #284 from gavincornwell/master

MOBSDK-715 and some other minor changes