Merged from trunk

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