Merge branch 'mdl41996-master' of https://github.com/tlock/moodle