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