MOBILE-2422
Merge pull request #201 from jmpascal/master

MOBILE-2422