Merge branch 'MDL-78966-master' of https://github.com/rjnl/moodle