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