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