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