Merge branch 'maintenance-0.20.x' into yandex-prod
authorAlexey Andriyanov <alan@al-an.info>
Tue, 29 Mar 2016 15:10:43 +0000 (18:10 +0300)
committerAlexey Andriyanov <alan@al-an.info>
Tue, 29 Mar 2016 15:10:43 +0000 (18:10 +0300)

Trivial merge