Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 1 Oct 2014 14:54:48 +0000 (18:54 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 1 Oct 2014 14:54:48 +0000 (18:54 +0400)

Trivial merge