MOBILE-1872
Merge pull request #150 from jmpascal/master

MOBILE-1872