Merge branch 'improved_breakdowns' into jgrpp

# Conflicts:
#	src/vehiclelist.cpp

src/engine_gui.cpp

@@ -126,7 +126,7 @@ struct EnginePreviewWindow : Window {
 		switch (widget) {
 			case WID_EP_YES:
 				DoCommandP(0, this->window_number, 0, CMD_WANT_ENGINE_PREVIEW);
-				/* FALL THROUGH */
+				FALLTHROUGH;
 			case WID_EP_NO:
 				if (!_shift_pressed) delete this;
 				break;