MOBILE-2137
Merge pull request #171 from jmpascal/master

MOBILE-2137