Merge remote-tracking branch 'origin/4.1'

Conflicts:
	src/plugins/autotest/qtest/qttestoutputreader.cpp

Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f

src/plugins/macros/macromanager.cpp

@@ -178,6 +178,8 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
 
     // Remove macro from the map
     Macro *macro = macros.take(name);
+    if (macro == currentMacro)
+        currentMacro = 0;
     delete macro;
 }