Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 14 Apr 2014 14:56:48 +0000 (18:56 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 14 Apr 2014 14:56:48 +0000 (18:56 +0400)

Trivial merge