fix for WM
Merge branch 'master' of github.com:rhomobile/RMS-Testing