Merge pull request #401 from gavincornwell/master

MOBILE-3045