Merge branch 'svn1_8_new'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 15 Oct 2013 13:35:19 +0000 (17:35 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 15 Oct 2013 13:35:19 +0000 (17:35 +0400)

Trivial merge