MOBILE-1813
Merge pull request #128 from jmpascal/master

[QA Fix]