From 61ed0fa180cc8fa29477473819b8ce44dc550170 Mon Sep 17 00:00:00 2001
From: Vsevolod Orlov <vorloff@yandex-team.ru>
Date: Tue, 2 Feb 2016 16:44:55 +0300
Subject: [PATCH] Merge