Merge branch 'MDL-59556-master' of https://github.com/abias/moodle