Sync up with rust master