Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 21 Oct 2014 15:08:31 +0000 (17:08 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 21 Oct 2014 15:08:31 +0000 (17:08 +0200)

Trivial merge