From 1288087809aa40c0007a25788001d7a82b0e86b8 Mon Sep 17 00:00:00 2001
From: Vsevolod Orlov <vorloff@yandex-team.ru>
Date: Wed, 26 Aug 2015 12:19:32 +0300
Subject: [PATCH] Merge