text fix
Merge branch '4.2-dev' into newdev