Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 16 Sep 2014 15:32:19 +0000 (19:32 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 16 Sep 2014 15:32:19 +0000 (19:32 +0400)

Trivial merge