Merge branch 'clippy_optional' of https://github.com/Manishearth/parity into Manishearth-clippy_optional