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