lucene 4
update
Merge branch 'master' into lucene4
Merge branch 'master' into lucene4