fix EMBPD00151232
Merge branch 'master' of github.com:rhomobile/rhodes