Merge branch 'wip-MDL-50851-backupfix' of https://github.com/marinaglancy/moodle