Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle