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