Merge remote-tracking branch 'origin/master' pycharm/163.3748 pycharm/163.3749
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 1 Sep 2016 23:18:38 +0000 (01:18 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 1 Sep 2016 23:18:38 +0000 (01:18 +0200)

Trivial merge