Merge remote-tracking branch 'origin/BetterVanillaIntegration' into v2.0
Merge remote-tracking branch 'origin/v2.0' into SailorsBackpack