merge collect edition

merge sauerbraten svn r4100-4731 (collect edition)