Merge remote-tracking branch 'origin/11.0'

Conflicts:
	src/plugins/debugger/debuggeritemmanager.cpp

Change-Id: I9d99d13feff9315f52eacbd84857c63cb69bf804

src/plugins/python/pythonsettings.cpp

@@ -350,6 +350,18 @@ public:
         return {};
     }
 
+    QStringList keywords() const final
+    {
+        return {
+            Tr::tr("Name:"),
+            Tr::tr("Executable"),
+            Tr::tr("&Add"),
+            Tr::tr("&Delete"),
+            Tr::tr("&Clean Up"),
+            Tr::tr("&Make Default")
+        };
+    }
+
 private:
     InterpreterOptionsWidget *m_widget = nullptr;
 };