Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 3 Mar 2015 12:15:04 +0000 (13:15 +0100)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 3 Mar 2015 12:15:04 +0000 (13:15 +0100)

Trivial merge