Merge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle