MOBILE-2297
Merge pull request #184 from jmpascal/1.4-Dev

MOBILE-2297