Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 26 May 2015 10:16:18 +0000 (13:16 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 26 May 2015 10:16:18 +0000 (13:16 +0300)

Trivial merge