Merge pull request #3197 from dago/pid_test