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