MOBILE-2187
Merge pull request #174 from jmpascal/master

MOBILE-2187