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