Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Aug 2016 18:50:44 +0000 (20:50 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Aug 2016 18:50:44 +0000 (20:50 +0200)

Trivial merge