Fix switch from "skybox" to other sky types as triggered by player:set_sky()
regenerating map fix (bad, but works)
Merge remote-tracking branch 'upstream/master' into next