Autodetection of file encoding based in org.apache.tika
Merge origin/master