Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 18 Aug 2015 15:39:31 +0000 (17:39 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 18 Aug 2015 15:39:31 +0000 (17:39 +0200)

Trivial merge