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