Merged with fs2open/trunk Revision 9530