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