Merge branch 'master' into HEAD

Conflicts:
	rooibos/solr/views.py