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

python/codeInsight/intentions/PyJoinIfIntention.java: notice outer 'else'.

python/testData/intentions/afterConvertLambdaToFunction.py

@@ -1,2 +1,3 @@
 def newlist(x, y):
     return (x + y) / y
+

python/testData/intentions/afterSplitIf.py

@@ -1,6 +1,7 @@
 def foo():
     if a + 2 > 3:
         if b < 4:
+        #comment
             a = a and b
             b = 4
         elif a > 20:

python/testData/intentions/beforeJoinIfElse.py

@@ -0,0 +1,7 @@
+def foo():
+    if <caret>a + 2 > 3:
+        if b < 4:
+            a = a and b
+            b = 4
+    else: # this prevents ifs from joining
+        print a

python/testData/intentions/beforeSplitIf.py

@@ -1,5 +1,6 @@
 def foo():
     i<caret>f a + 2 > 3 and b < 4:
+    #comment
         a = a and b
         b = 4
     elif a > 20: