Merge branch 'MDL-38766/master' of github.com:kemitix/moodle