Merge branch 'master' into jgrpp

# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h

src/settings.cpp

@@ -1130,7 +1130,7 @@ static bool InvalidateNewGRFChangeWindows(int32 p1)
 
 static bool InvalidateCompanyLiveryWindow(int32 p1)
 {
-	InvalidateWindowClassesData(WC_COMPANY_COLOUR);
+	InvalidateWindowClassesData(WC_COMPANY_COLOUR, -1);
 	return RedrawScreen(p1);
 }