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