Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 18 Feb 2014 16:59:05 +0000 (20:59 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 18 Feb 2014 16:59:05 +0000 (20:59 +0400)

Trivial merge