Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 10 Oct 2014 19:58:26 +0000 (23:58 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 10 Oct 2014 19:58:26 +0000 (23:58 +0400)

Trivial merge