Merge with Trunk Revision 8910.
Merge with Trunk Revision 8915.
Merge with Trunk Revision 8972.
Merge with Trunk Revision 9012.
Merge with Trunk Revision 9028.
Merge with Trunk Revision 9031.
Merge with Trunk Revision 9069.
Merge with Trunk Revision 9079.
Merge with Trunk Revision 9097.
Merge with Trunk Revision 9104.
Merge with Trunk Revision 9115
Merge with trunk/fs2open Revision 9514.
Merge with Trunk Revision 9520.
Forgot to merge in these files.
Merged with fs2open/trunk Revision 9530
Merge with Trunk Revision 9613
Fixed merge conflicts.