Catching up fork to rust-lang:master