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