Merge remote-tracking branch 'origin/master' appcode/138.524 cppide/138.527 idea/138.526 idea/138.531 phpstorm/138.532 pycharm/138.525 rubymine/138.528 webstorm/138.529 webstorm/138.533
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 9 Jun 2014 18:19:15 +0000 (22:19 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 9 Jun 2014 18:19:15 +0000 (22:19 +0400)

Trivial merge