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