[REVIEW]MOBILE-1149/1144
[REVIEW]MOBILE-1149+MOBILE-1144
[REVIEW]MOBILE-1149+MOBILE-1144
Merge pull request #64 from jmpascal/master

[REVIEW]MOBILE-1149/1144