Merge remote-tracking branch 'origin/master' appcode/140.16 clion/140.17 phpstorm/140.15 webstorm/140.18
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 7 Oct 2014 19:42:01 +0000 (23:42 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 7 Oct 2014 19:42:01 +0000 (23:42 +0400)

Trivial merge