Trunk Sync: r10464
This is sans Trunk Commit 10463 due to osapi changes.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10465 387891d4-d844-0410-90c0-e4c51a9137d3
Merge changes of trunk r10463.

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