Merge pull request #2049 from douglaz/run-clippy-fix