merge
Merge branch 'master' of https://github.com/subdavis/clippy
Merge branch 'master' of https://github.com/subdavis/clippy
fix
Merge branch 'master' of https://github.com/subdavis/clippy