Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: I975a4208588d174ebb44054de56c5ac8d7c878fe

src/plugins/coreplugin/mainwindow.h

@@ -236,6 +236,7 @@ private:
     QColor m_overrideColor;
 
     QStringList m_filesToOpenDelayed;
+    QTimer *m_autoSaveSessionTimer;
 };
 
 } // namespace Internal