Merge upstream/master and solr into master.