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