Merge remote-tracking branch 'origin/master' idea/163.5912
authorKonstantin Bulenkov <kb@jetbrains.com>
Fri, 7 Oct 2016 13:02:14 +0000 (15:02 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Fri, 7 Oct 2016 13:02:14 +0000 (15:02 +0200)

Trivial merge