Forward port of e9c8aefbce from stable/1.7.x
e9c8aefbce
Forward port of 49280a73ea from stable/1.7.x
49280a73ea
Thanks to Xwybylty Soslan for the translation work.