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