5 Years Ago
merge from injured_map_fixes