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