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