Merge branch 'master' into jgrpp

# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h

src/tree_cmd.cpp

@@ -369,7 +369,7 @@ void RemoveAllTrees()
 		for(uint j = 0; j < MapSizeY(); j++) {
 			TileIndex tile = TileXY(i, j);
 			if(GetTileType(tile) == MP_TREES) {
-				DoCommandP(tile, 0, 0, CMD_LANDSCAPE_CLEAR | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound10);
+				DoCommandP(tile, 0, 0, CMD_LANDSCAPE_CLEAR | CMD_MSG(STR_ERROR_CAN_T_CLEAR_THIS_AREA), CcPlaySound_EXPLOSION);
 			}
 		}
 	}