Merge remote-tracking branch 'origin/master'

platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java

@@ -276,7 +276,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
 
         @Override
         public void schemeChanged(final CodeStyleScheme scheme) {
-          //do nothing
+          reset();
         }
       });
     }

python/helpers/coverage_runner/run_coverage.py

@@ -40,6 +40,8 @@ for arg in sys.argv:
         argv.append(arg)
 sys.argv = argv
 
+cwd = os.getcwd()
 main()
 if run_cov:
+    os.chdir(cwd)
     main(["xml", "-o", coverage_file + ".xml", "--ignore-errors"])