devel is now compiling and is up to date with the release-2.0.0 branch.  The crossbuild is also working now.

@brianvanderburg2  -- I noticed that when I run the game in the devel branch, everything in the package window shows up blank, and I don't see any way to create packages in that tab.  It was like this before I merged from release-2.0.0.  You might want to double check and open a bug ticket if you find a problem so that we can track it.
Also, your PR #294 may have to be adjusted slightly, since I removed some Alex code references in devel to get it to compile.  If your PR assumed these Alex code references were there, it may break.

@SonOfBowser - Your PR #296 is now merged into devel.  You might want to double check.  Most people just check that the code looks merged correctly (this one auto merged), but feel free to test it, too, if you want.

@Quintus - you had some commits that merged as well, so feel free to check as you see fit.
Also, Quintus, will the file names that Brian Vanderbug changed in PR #294 cause merge conflicts?  If they don't, it'd make sense to add his PR to devel.  If they do, it would result in a lot of conflicts, and we should probably wait.