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