Merge remote-tracking branch 'origin/master' pycharm/163.3778
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 2 Sep 2016 10:37:38 +0000 (12:37 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 2 Sep 2016 10:37:38 +0000 (12:37 +0200)

Trivial merge