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