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