Merge from world_update_2 Had to subtract the elevator merges as the custom manifest rebuilds have caused aux2 to lose some merge links, resulting in merge conflicts in files that should not have merge conflicts