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