Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 3 Jul 2015 09:19:55 +0000 (11:19 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 3 Jul 2015 09:19:55 +0000 (11:19 +0200)

Trivial merge