Merge pull request #4685 from fritsch/pacork