Merge with Trunk Revision 8557.
Merge branch 'master' into profiling
Merge with Trunk Revision 8613.
Merge with Trunk Revision 8627.
Merge with Trunk Revision 8658.
Merge with Trunk Revision 8670.
Merge with Trunk Revision 8871
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.