Merge branch 'cpp-11' into enhanced_viewport_overlay

# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp

source.list

@@ -314,6 +314,7 @@ road_type.h
 roadstop_base.h
 roadveh.h
 safeguards.h
+scope.h
 screenshot.h
 sdl.h
 sound/sdl_s.h
@@ -427,6 +428,7 @@ core/alloc_type.hpp
 core/backup_type.hpp
 core/bitmath_func.cpp
 core/bitmath_func.hpp
+core/container_func.hpp
 core/endian_func.hpp
 core/endian_type.hpp
 core/enum_type.hpp