Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Thu, 18 Sep 2014 06:10:01 +0000 (10:10 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Thu, 18 Sep 2014 06:10:01 +0000 (10:10 +0400)

Trivial merge