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