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