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