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