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