Patch for TIKA-1127 provided by Ali Mosavian.

git-svn-id: https://svn.apache.org/repos/asf/tika/trunk@1486665 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of git://github.com/apache/tika into trunk