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