merging japaric/rust/moar-uc = 8f98078b into auto