Merge pull request #1 from larsbergstrom/zmike_cargo_fixups …
Update various Cargo patches and deal with the fallout