Merge "Fix warnings in preparation for Rust 1.53.0"