Merge pull request #1331 from hwhw/master

pull latest base: fix libk2pdfopt