@arthurbenemann Disregard the changes/commits to the submodules. Somehow, I always manage to mix up their state :(
I'll try to see if I can get them back to the same state as on upstream/master.