Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 6 Feb 2015 15:15:47 +0000 (18:15 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 6 Feb 2015 15:15:47 +0000 (18:15 +0300)

Trivial merge