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