Merge branch 'MDL-59499-master-classfix' of github.com:snake/moodle