Merge branch 'upstream_local' into final

Conflicts:
	course/templates/course/gradebook-by-opp.html
	course/templates/course/gradebook-opp-list.html
	course/templates/course/gradebook-participant-list.html
	course/templates/course/gradebook-participant.html
	course/templates/course/gradebook-single.html
	course/templates/course/gradebook.html
	course/templates/course/grading-statistics.html