Merge branch 'MDL-47959' of git://github.com/colchambers/moodle