Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 31 Aug 2016 17:34:26 +0000 (19:34 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 31 Aug 2016 17:34:26 +0000 (19:34 +0200)

Trivial merge