Merge upstream GitLab into Heptapod

Georges Racinetrequested to merge
topic/heptapod-future/upstream-merge into branch/heptapod-future

Brings in 115 non-merge commits.

Merge request reports