Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle