Merge branch 'master' into save_ext

# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h

src/settings.cpp

@@ -1317,6 +1317,15 @@ static bool MaxVehiclesChanged(int32 p1)
 	return true;
 }
 
+static bool InvalidateShipPathCache(int32 p1)
+{
+	Ship *s;
+	FOR_ALL_SHIPS(s) {
+		s->path.clear();
+	}
+	return true;
+}
+
 
 #ifdef ENABLE_NETWORK