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