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