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