Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 30 Mar 2017 16:35:12 +0000 (18:35 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 30 Mar 2017 16:35:12 +0000 (18:35 +0200)

Trivial merge