Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 2 Sep 2014 17:39:02 +0000 (21:39 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 2 Sep 2014 17:39:02 +0000 (21:39 +0400)

Trivial merge