Merge branch 'master' into jgrpp

# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp

src/newgrf.cpp

@@ -4749,7 +4749,7 @@ static void NewSpriteGroup(ByteReader *buf)
 				}
 			}
 
-			group->num_ranges = optimised.size();
+			group->num_ranges = (uint)optimised.size(); // cast is safe, there should never be 2**31 elements here
 			if (group->num_ranges > 0) {
 				group->ranges = MallocT<DeterministicSpriteGroupRange>(group->num_ranges);
 				MemCpyT(group->ranges, &optimised.front(), group->num_ranges);