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

Trivial merge