Merge branch 'master' of ssh://bradh@git.freedesktop.org/git/poppler/poppler