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