Bring up to date with rust master