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