Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 22 Dec 2014 18:34:36 +0000 (19:34 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 22 Dec 2014 18:34:36 +0000 (19:34 +0100)

Trivial merge