Merge branch 'MDL-33980' of github.com:equella/moodle