Merge remote-tracking branch 'origin/master' appcode/163.5807 appcode/163.5820 clion/163.5804 dbe/163.5806 idea/163.5792 idea/163.5808 phpstorm/163.5809 pycharm/163.5803 pycharm/163.5810 rubymine/163.5805 webstorm/163.5816
authorKonstantin Bulenkov <kb@jetbrains.com>
Wed, 5 Oct 2016 19:55:41 +0000 (21:55 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Wed, 5 Oct 2016 19:55:41 +0000 (21:55 +0200)

Trivial merge