MOBILE-2987
Merge pull request #232 from jmpascal/master

MOBILE-2987