Merge with trunk/fs2open Revision 9514.