Merge upstream GitLab into Heptapod

Merged Georges Racinet requested to merge topic/heptapod/upstream-merge-optimistic into branch/heptapod

Brings in 527 non-merge commits.

Merge request reports