Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle