Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 13 Apr 2015 22:37:30 +0000 (01:37 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 13 Apr 2015 22:37:30 +0000 (01:37 +0300)

Trivial merge