Merge "Fix 'ps --ppid'."