Merge Tika 1.3 onto tika-gv