Merge branch 'openNLP_1'
Merge branch 'master' into openNLP_1