Merge branch 'MDL-55720' of https://github.com/ak4t0sh/moodle