Merge pull request #5823 from neheb/p11-kit