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