Merge remote-tracking branch 'origin/3.1'

Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I1bad0c1477d7fd6996c0f8ca82e76ba521bc0dcc

src/plugins/cppeditor/cppincludehierarchy.cpp

@@ -51,7 +51,7 @@
 #include <QVBoxLayout>
 
 using namespace CppEditor;
-using namespace Internal;
+using namespace CppEditor::Internal;
 using namespace Utils;
 
 namespace CppEditor {