Merge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle