Fix two little glitches in intro and outro scenes
Merge branch 'upstream/master' into fixes
Restore ancient behaviour
Merge remote-tracking branch 'Flakebi/fixes'