Merge branch 'MDL-68572-master' of https://github.com/catalyst/moodle