merge x11 13d79104c1b5160310ee8891ae4af3f1b84b588b

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>