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