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