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