Update for Rust master

Not sure whether you want this or not, but here it is in case you do. Feel free to cherry-pick.