Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle