Auto-Merge pull request #3206 from dago/pid_test