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