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