Merge with Trunk Revision 9520.
Merge branch 'master' into multilock
Forgot to merge in these files.
Merge branch 'master' into multilock
Merged with fs2open/trunk Revision 9530
Merge branch 'master' into multilock