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