transl contd
Merge branch '1.x-stable' into develop