Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 21 Oct 2015 12:49:07 +0000 (14:49 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 21 Oct 2015 12:49:07 +0000 (14:49 +0200)

Trivial merge