• Merge pull request #1 from larsbergstrom/zmike_cargo_fixups

    Update various Cargo patches and deal with the fallout
    zmike committed May 22, 2015