Trunk sync 10121; ought to include things that have slipped through in previous sync attempts.

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