Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 3 Sep 2014 18:05:26 +0000 (22:05 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 3 Sep 2014 18:05:26 +0000 (22:05 +0400)

Trivial merge