Also submitted patch to Lucene

https://issues.apache.org/jira/browse/LUCENE-5725