Merge branch 'master' into solr_client