Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 4 Oct 2016 08:33:13 +0000 (11:33 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 4 Oct 2016 08:33:13 +0000 (11:33 +0300)

Trivial merge