Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 1 Sep 2014 07:42:19 +0000 (11:42 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 1 Sep 2014 07:42:19 +0000 (11:42 +0400)

Trivial merge