MOBILE-3051
Merge pull request #234 from jmpascal/master

MOBILE-3051