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

Trivial merge