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