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