Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 25 Mar 2014 17:29:02 +0000 (21:29 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 25 Mar 2014 17:29:02 +0000 (21:29 +0400)

Trivial merge