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