camlpdf.2.1.1 and cpdf 2.1.1
Merge pull request #3122 from johnwhitington/master

camlpdf.2.1.1 and cpdf 2.1.1