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