Merge branch 'master' into bulk_solr_load3
Merge branch 'bulk_solr_load3' into bulk_solr_load4