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