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