Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 13 Sep 2016 20:10:04 +0000 (22:10 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 13 Sep 2016 20:10:04 +0000 (22:10 +0200)

Trivial merge