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