Merge branch 'master' of git.labs.intellij.net:idea/ultimate

python/src/com/jetbrains/python/console/PyConsoleProcessHandler.java

@@ -32,6 +32,8 @@ public class PyConsoleProcessHandler extends ColoredProcessHandler {
   protected void textAvailable(final String text, final Key attributes) {
     final String string = processPrompts(myLanguageConsole, StringUtil.convertLineSeparators(text));
     PyConsoleHighlightingUtil.processOutput(myLanguageConsole, string, attributes);
+    // scroll to end
+    myLanguageConsole.queueUiUpdate(true);
   }
 
   private String processPrompts(final LanguageConsoleImpl languageConsole, String string) {

python/src/com/jetbrains/python/structureView/PyStructureViewModel.java

@@ -38,4 +38,9 @@ public class PyStructureViewModel extends StructureViewModelBase implements Stru
   public boolean isAutoExpand(StructureViewTreeElement element) {
     return element.getValue() instanceof PsiFile;
   }
+
+  @Override
+  public boolean isSmartExpand() {
+    return false;
+  }
 }