Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle