Merge branch '7.x' into 7.x-fix-deprecated-call

Conflicts:
	islandora_solr_views_query.inc