Merge branch 'MDL-63284-master' of https://github.com/Clyxz/moodle