Merge https://github.com/davidhalperin/rust
Merge https://github.com/davidhalperin/rust