merging japaric/rust/moar-uc = db00fa55 into auto