Update to rust master

Continuation of #1077