Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 1 Sep 2016 19:59:03 +0000 (21:59 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 1 Sep 2016 19:59:03 +0000 (21:59 +0200)

Trivial merge