Merge branch 'MDL-26047' of git://github.com/ptrkmkl/moodle