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

Trivial merge