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