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