Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

src/plugins/coreplugin/designmode.cpp

@@ -189,6 +189,7 @@ void DesignMode::unregisterDesignWidget(QWidget *widget)
     foreach (DesignEditorInfo *info, d->m_editors) {
         if (info->widget == widget) {
             d->m_editors.removeAll(info);
+            delete info;
             break;
         }
     }