Merge branch 'MDL-67850-seb-integration-3' of https://github.com/catalyst/moodle