Update to rust master

Also merge some other PRs while I'm at it