Merged revision(s) 1388079-1388264 from lucene/dev/trunk

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