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