Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 13 Nov 2014 13:09:08 +0000 (14:09 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 13 Nov 2014 13:09:08 +0000 (14:09 +0100)

Trivial merge