Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Sat, 2 Jul 2016 17:49:57 +0000 (19:49 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Sat, 2 Jul 2016 17:49:57 +0000 (19:49 +0200)

Trivial merge