update against latest rust/master