Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 6 Apr 2015 13:28:31 +0000 (16:28 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 6 Apr 2015 13:28:31 +0000 (16:28 +0300)

Trivial merge