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