Increase version to avoid a lower version in v2021 than in v2020

Fix history by merging v2020 and v2021 to avoid divergence as suggested at !15 (comment 45149)