Merge remote-tracking branch 'origin/master'
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 14 Oct 2014 09:28:57 +0000 (13:28 +0400)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Tue, 14 Oct 2014 09:28:57 +0000 (13:28 +0400)

Trivial merge