Merge branch 'MDL-77783-master' of https://github.com/junpataleta/moodle