Merge branch 'release/2.9' into develop

Conflicts:
	VERSION
	lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm