MOBILE-2370
Merge pull request #190 from jmpascal/1.4-Dev

MOBILE-2370