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