Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

src/plugins/git/gitclient.cpp

@@ -270,6 +270,7 @@ void GitDiffHandler::addJob(VcsCommand *command,
         args << QLatin1String("--ignore-space-change");
     args << QLatin1String("--unified=") + QString::number(
                 m_controller->contextLinesNumber());
+    args << QLatin1String("--src-prefix=a/") << QLatin1String("--dst-prefix=b/");
     args << arguments;
     command->addJob(args, timeout());
 }