Merge pull request #96 from jmpascal/master

MOBILE-1631