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