re-apply r1436460

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