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/osk_gui.cpp

@@ -421,7 +421,7 @@ void ShowOnScreenKeyboard(Window *parent, int button)
  * Updates the original text of the OSK so when the 'parent' changes the
  * original and you press on cancel you won't get the 'old' original text
  * but the updated one.
- * @param parent window that just updated its orignal text
+ * @param parent window that just updated its original text
  * @param button widget number of parent's textbox to update
  */
 void UpdateOSKOriginalText(const Window *parent, int button)