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