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