Merge branch 'MDL-68912' of https://github.com/rlorenzo/moodle