Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 15 Oct 2014 16:05:09 +0000 (20:05 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 15 Oct 2014 16:05:09 +0000 (20:05 +0400)

Trivial merge