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

python/build/pycharm.exe4j

@@ -55,7 +55,9 @@
       <archive location="lib/jdom.jar" failOnError="true"/>
       <archive location="lib/extensions.jar" failOnError="true"/>
     </classPath>
-    <nativeLibraryDirectories/>
+    <nativeLibraryDirectories>
+      <directory name="./bin"/>
+    </nativeLibraryDirectories>
   </java>
   <includedFiles/>
 </exe4j>

python/src/com/jetbrains/python/PythonBundledColorSchemeProvider.java

@@ -13,6 +13,8 @@ public class PythonBundledColorSchemeProvider implements BundledColorSchemesProv
 
   public static final String[] PATHS = {
     "/colorSchemes/WarmNeon",
+    "/colorSchemes/monokai",
+    "/colorSchemes/twilight",
   };
 
   @Override

python/src/com/jetbrains/python/actions/AddIgnoredIdentifierFix.java

@@ -1,5 +1,6 @@
 package com.jetbrains.python.actions;
 
+import com.intellij.codeInsight.intention.LowPriorityAction;
 import com.intellij.codeInspection.InspectionProfile;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
@@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author yole
  */
-public class AddIgnoredIdentifierFix implements LocalQuickFix {
+public class AddIgnoredIdentifierFix implements LocalQuickFix, LowPriorityAction {
   private final String myIdentifier;
 
   public AddIgnoredIdentifierFix(String identifier) {