Merge branch 'MDL-60809-master' of git://git.cameron1729.xyz/moodle