Trying to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	jetty/solr/blacklight-core/data/index/segments.gen
	jetty/solr/blacklight-core/data/spell/segments.gen
	jetty/solr/blacklight-core/data/spell_author/segments.gen
	jetty/solr/blacklight-core/data/spell_subject/segments.gen
	jetty/solr/blacklight-core/data/spell_title/segments.gen