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