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