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