Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 2 Jul 2015 14:34:01 +0000 (16:34 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 2 Jul 2015 14:34:01 +0000 (16:34 +0200)

Trivial merge