committed changes; note that solr.xsl is broken