pulling in changes from solr2052 on trunk