Merge branch 'prereqs-refactor' into experimental-prereqs-in-search-index

Conflicts:
	inc/fit-db.php