Merge remote-tracking branch 'origin/master'

platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java

@@ -932,12 +932,7 @@ public final class EditorUtil {
     DocumentEx document = ObjectUtils.tryCast(editor.getDocument(), DocumentEx.class);
     if (document != null && document.isInBulkUpdate()) {
       MessageBusConnection connection = ApplicationManager.getApplication().getMessageBus().connect();
-      disposeWithEditor(editor, new Disposable() {
-        @Override
-        public void dispose() {
-          connection.disconnect();
-        }
-      });
+      disposeWithEditor(editor, connection);
       connection.subscribe(DocumentBulkUpdateListener.TOPIC, new DocumentBulkUpdateListener.Adapter() {
         @Override
         public void updateFinished(@NotNull Document doc) {

python/helpers/coverage_runner/run_coverage.py

@@ -37,8 +37,7 @@ if run_cov:
 
 argv = []
 for arg in sys.argv:
-    if arg.startswith('-m'):
-        argv.append('-m')
+    if arg.startswith('-m') and arg[2:]:
         argv.append(arg[2:])
     else:
         argv.append(arg)