sync with trunk

git-svn-id: svn://svn.icculus.org/fs2open/branches/Goober5000@10443 387891d4-d844-0410-90c0-e4c51a9137d3
commit WIP SCP_string parsing enhancement

git-svn-id: svn://svn.icculus.org/fs2open/branches/Goober5000@10444 387891d4-d844-0410-90c0-e4c51a9137d3