Merge branch 'wip-MDL-62520_MASTER' of https://github.com/jason-platts/moodle