Merge branch 'MDL-26190' of git://github.com/srynot4sale/moodle