From 515da31d88a6a2a23ece5121ad88e8e083f7efeb Mon Sep 17 00:00:00 2001
From: Maxim Dounin <mdounin@mdounin.ru>
Date: Fri, 18 Apr 2014 20:08:47 +0400
Subject: [PATCH] stable-1.6 branch