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