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