MOBILE-3053
Merge pull request #236 from jmpascal/master

MOBILE-3053