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