Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 6 Sep 2016 21:48:49 +0000 (23:48 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 6 Sep 2016 21:48:49 +0000 (23:48 +0200)

Trivial merge