Merge pull request #408 from mikeh/master

MOBILE-3068