Merge remote-tracking branch 'origin/poppler-0.22'