Merge remote-tracking branch 'moodle/master' into MDL-42179-master

Conflicts:
	mod/assign/gradingtable.php

Change-Id: I6e8ed28390dafbdf3fdb9c8fd4a58969284b3f79