Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle