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