Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 29 Sep 2016 10:51:14 +0000 (12:51 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 29 Sep 2016 10:51:14 +0000 (12:51 +0200)

Trivial merge