MOBILE-1814
Merge pull request #133 from jmpascal/master

[QA Fix]