PPC: upstream changes [1999c08..ee3dc04]