Merge branch 'MDL-30021' of git://github.com/timhunt/moodle