Update for ES 1.0 and Solr 4.7