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