Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 18 Aug 2015 11:38:17 +0000 (14:38 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 18 Aug 2015 11:38:17 +0000 (14:38 +0300)

Trivial merge