Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Fri, 25 Sep 2015 22:05:21 +0000 (00:05 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Fri, 25 Sep 2015 22:05:21 +0000 (00:05 +0200)

Trivial merge