Merge remote-tracking branch 'origin/fitermay/PY-20771'
authorLiana.Bakradze <liana.bakradze@jetbrains.com>
Thu, 6 Oct 2016 15:21:30 +0000 (18:21 +0300)
committerLiana.Bakradze <liana.bakradze@jetbrains.com>
Thu, 6 Oct 2016 15:21:30 +0000 (18:21 +0300)

Trivial merge