-Merge from trunk

git-svn-id: http://odamex.net/svn/root/branches/rend32@3836 b0bcef46-2027-0410-bd56-ab726e9a1d04
-Merge from trunk

git-svn-id: http://odamex.net/svn/root/branches/rend32@3841 b0bcef46-2027-0410-bd56-ab726e9a1d04