MOBILE-2228
Merge pull request #178 from jmpascal/1.4-Dev

MOBILE-2228