MOBILE-1738
Merge pull request #46 from jmpascal/master

[Review] MOBILE-1738