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