Merge branch 'MDL-53256-m' of https://github.com/micaherne/moodle