Merge branch 'wip-MDL-64729-master' of https://github.com/Beedell/moodle