Merge branch 'wip-MDL-59523-master-fix' of git://github.com/abgreeve/moodle