Trunk sync r10558.


git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10559 387891d4-d844-0410-90c0-e4c51a9137d3
Fix some stuff apparently missed in trunk syncs.

git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10560 387891d4-d844-0410-90c0-e4c51a9137d3