Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle