Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle