This just merges upstream into whatever commit the submodule was on.

Not sure why the commit list is so extensive here. Again, I'll have to look at this closer. Could have done something wrong.