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