Merge commit '82ca0' into fixdev2

Conflicts:
	course/html/358bdf63844b4dbe8472f22865fad294.html