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