Fix for TIKA-1422 contributed by tpalsulich and mattmann.

git-svn-id: https://svn.apache.org/repos/asf/tika/trunk@1631206 13f79535-47bb-0310-9956-ffa450edef68