Restore changes introduced in commit c5ee9dce0b3fab72ac17ff8444b918e58f1d61c7
Merge branch 'master' of github.com:rhomobile/rhodes