MOBILE-1861 / MOBILE-1865
Merge pull request #151 from jmpascal/master

MOBILE-1861 / MOBILE-1865