Merge remote-tracking branch 'upstream/master'

Conflicts:
	tutorweb/quiz/resources/quiz.html