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