Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 10 Sep 2014 17:12:18 +0000 (21:12 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 10 Sep 2014 17:12:18 +0000 (21:12 +0400)

Trivial merge