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