Update with latest CLucene changes