Merge remote-tracking branch 'origin/liana/PY-20932'
authorLiana.Bakradze <liana.bakradze@jetbrains.com>
Wed, 5 Oct 2016 08:40:17 +0000 (11:40 +0300)
committerLiana.Bakradze <liana.bakradze@jetbrains.com>
Wed, 5 Oct 2016 08:40:17 +0000 (11:40 +0300)

Trivial merge