Merge tag '14.0-beta2' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp

src/misc_gui.cpp

@@ -30,6 +30,7 @@
 #include "viewport_func.h"
 #include "rev.h"
 #include "core/backup_type.hpp"
+#include "pathfinder/water_regions.h"
 
 #include "widgets/misc_widget.h"
 
@@ -145,6 +146,8 @@ public:
 			DEBUG(misc, LANDINFOD_LEVEL, "m6     = %#x", _me[tile].m6);
 			DEBUG(misc, LANDINFOD_LEVEL, "m7     = %#x", _me[tile].m7);
 			DEBUG(misc, LANDINFOD_LEVEL, "m8     = %#x", _me[tile].m8);
+
+			PrintWaterRegionDebugInfo(tile);
 		}
 #undef LANDINFOD_LEVEL
 	}