Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle