Merge branch 'MDL-25723' of git://github.com/epsd/moodle