Merge branch 'wip-MDL-31025-m23' of https://github.com/samhemelryk/moodle