Merge r1362429 into release maintenance branch for 1.2.

git-svn-id: https://svn.apache.org/repos/asf/tika/branches/1.2@1362605 13f79535-47bb-0310-9956-ffa450edef68
5 files changed