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