Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 31 Jul 2014 18:00:53 +0000 (22:00 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 31 Jul 2014 18:00:53 +0000 (22:00 +0400)

Trivial merge