Merge branch 'wip-MDL-36363-m25' of https://github.com/samhemelryk/moodle