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