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