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