Merge remote-tracking branch 'origin/master' appcode/140.2636 clion/140.2639 dbe/140.2632 idea/140.2635 phpstorm/140.2638 pycharm/140.2634 rubymine/140.2637 webstorm/140.2633
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 20 Feb 2015 22:56:40 +0000 (01:56 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 20 Feb 2015 22:56:40 +0000 (01:56 +0300)

Trivial merge