Fix build with current Rust
Merge remote-tracking branch 'pinumbernumber/master'