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