Bring hammer up to date with rust master