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