Merge pull request #754 from dmick/wip-checkcerts