Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 6 Jul 2015 12:22:08 +0000 (14:22 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 6 Jul 2015 12:22:08 +0000 (14:22 +0200)

Trivial merge