Merge branch 'MDL-49802-master' of git://github.com/FMCorz/moodle