Update to rust-master
Merge