Merge branch 'MDL-50176' of git://github.com/aolley/moodle