Merged 1.x-lucene into master