Merge branches 'master' and 'pycharm/folding' of git.labs.intellij.net:idea/community