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