Merge branch 'MDL-72674-master-fix' of github.com:sarjona/moodle