refix brain dead netadmin
Merge branch 'master' into sauerbraten
rerun dunno again with latest fixes