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