Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle