Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 17 Mar 2015 20:56:27 +0000 (23:56 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 17 Mar 2015 20:56:27 +0000 (23:56 +0300)

Trivial merge