LUCENE-5245: backport to lucene_4_5


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1526571 13f79535-47bb-0310-9956-ffa450edef68