Update to rust master