Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 12 Aug 2014 11:13:01 +0000 (13:13 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 12 Aug 2014 11:13:01 +0000 (13:13 +0200)

Trivial merge