Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Wed, 22 Jul 2015 12:54:50 +0000 (14:54 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Wed, 22 Jul 2015 12:54:50 +0000 (14:54 +0200)

Trivial merge