merging japaric/rust/moar-uc = 10bbf694 into auto