Updated for Rust 833277 and cgmath-rs e54265cb6