Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/console_gui.cpp

@@ -281,7 +281,7 @@ struct IConsoleWindow : Window
 
 			case WKC_RETURN: case WKC_NUM_ENTER: {
 				/* We always want the ] at the left side; we always force these strings to be left
-				 * aligned anyway. So enforce this in all cases by addding a left-to-right marker,
+				 * aligned anyway. So enforce this in all cases by adding a left-to-right marker,
 				 * otherwise it will be drawn at the wrong side with right-to-left texts. */
 				IConsolePrintF(CC_COMMAND, LRM "] %s", _iconsole_cmdline.buf);
 				const char *cmd = IConsoleHistoryAdd(_iconsole_cmdline.buf);