update to rust master