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