Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp

Recalculate docking tile cache due to 57553cd8

src/saveload/extended_ver_sl.h

@@ -78,6 +78,7 @@ enum SlXvFeatureIndex {
 	XSLFI_FLOW_STAT_FLAGS,                        ///< FlowStat flags
 	XSLFI_SPEED_RESTRICTION,                      ///< Train speed restrictions
 	XSLFI_STATION_GOODS_EXTRA,                    ///< Extra station goods entry statuses
+	XSLFI_DOCKING_CACHE_VER,                      ///< Multiple docks - docking tile cache version
 
 	XSLFI_RIFF_HEADER_60_BIT,                     ///< Size field in RIFF chunk header is 60 bit
 	XSLFI_HEIGHT_8_BIT,                           ///< Map tile height is 8 bit instead of 4 bit, but savegame version may be before this became true in trunk