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