#375 Update code to match Lucene 3.6.2