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