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