Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 28 Sep 2016 17:39:21 +0000 (19:39 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 28 Sep 2016 17:39:21 +0000 (19:39 +0200)

Trivial merge