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

Trivial merge