Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 17 Dec 2014 10:22:00 +0000 (13:22 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 17 Dec 2014 10:22:00 +0000 (13:22 +0300)

Trivial merge