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