Merge remote-tracking branch 'origin/pycharm/folding' into pycharm/folding
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Fri, 27 Nov 2015 10:37:22 +0000 (13:37 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Fri, 27 Nov 2015 10:37:22 +0000 (13:37 +0300)

Trivial merge