Update from upstream.

Same with os-autoinst.