Merge with Trunk Revision 9115
Merge with trunk/fs2open Revision 9514.
Fixed merge conflicts.