sync with trunk

git-svn-id: svn://svn.icculus.org/fs2open/branches/Goober5000@9848 387891d4-d844-0410-90c0-e4c51a9137d3
sync with trunk

git-svn-id: svn://svn.icculus.org/fs2open/branches/Goober5000@9849 387891d4-d844-0410-90c0-e4c51a9137d3
sync with trunk

git-svn-id: svn://svn.icculus.org/fs2open/branches/Goober5000@9850 387891d4-d844-0410-90c0-e4c51a9137d3
sync with trunk

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