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