Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 9 Feb 2016 00:36:24 +0000 (01:36 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 9 Feb 2016 00:36:24 +0000 (01:36 +0100)

Trivial merge