MOBILE-1837
Merge pull request #125 from jmpascal/master

[QA Fix]