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