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