Update to upstream version '0.10.4'

Open to being mentored on this, I committed some of the upstream code diff between 0.10.3 and 0.10.4 and it'd be nice to get it in an unstable and through the gauntlet.

To pre-emptively answer a question, the tarball in the github release is busted because of the git submodule, so the code needs to be fixed with a patch, or the tarball needs to be manually generated including the git submodule.