Merge branch 'master' into jgrpp

# Conflicts:
#	src/articulated_vehicles.cpp
#	src/articulated_vehicles.h
#	src/base_media_base.h
#	src/base_media_func.h
#	src/build_vehicle_gui.cpp
#	src/dock_gui.cpp
#	src/main_gui.cpp
#	src/music_gui.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_roadstop.cpp
#	src/os/windows/string_uniscribe.h
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/strings.cpp
#	src/terraform_gui.cpp
#	src/tests/test_script_admin.cpp
#	src/tests/test_window_desc.cpp
#	src/timer/timer_game_calendar.h
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/viewport.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h

src/newgrf_text.cpp

@@ -820,8 +820,6 @@ struct TextRefStack {
 		this->grffile = grffile;
 		this->used = true;
 	}
-
-	void RewindStack() { this->position = 0; }
 };
 
 /** The stack that is used for TTDP compatible string code parsing */
@@ -895,11 +893,6 @@ void StopTextRefStackUsage()
 	_newgrf_textrefstack.used = false;
 }
 
-void RewindTextRefStack()
-{
-	_newgrf_textrefstack.RewindStack();
-}
-
 /**
  * FormatString for NewGRF specific "magic" string control codes
  * @param scc   the string control code that has been read