merged PDFBOX-1615 rev. 1487557

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