Merge branch 'master' into jgrpp

# Conflicts:
#	src/newgrf_debug_gui.cpp
#	src/object_cmd.cpp
#	src/object_gui.cpp

.github/codeql/codeql-config.yml

@@ -8,3 +8,5 @@ query-filters:
     - cpp/world-writable-file-creation
     # Basically OpenTTD's coding style for adding things like ..._INVALID to enumerations
     - cpp/irregular-enum-init
+    # Our GUI code tends to use switches for OnClick handlers, DrawWidget, and UpdateWidgetSize. Sometimes GUIs just don't have many elements, but we want to keep consistency.
+    - cpp/trivial-switch