Merge branch 'MDL-68631' of https://github.com/jonof/moodle