PDFBOX-1812: merged trunk revisions 1557546 and 1558205

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/branches/1.8@1558309 13f79535-47bb-0310-9956-ffa450edef68