pulling in Mark's solr changes