Fixes #5149

also fixes clean_map_git.sh (mloooc)
Merge pull request #5263 from boopcat/happydrones

Fixes #5149