Merge pull request #2059 from martinbudden/pid_docs