Merge "Make ps -o error reporting intelligible."