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