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