Upstream GitLab merge

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

Onlu 51 non-merge changesets, stopping right before a conflict that has to be tested.

Merge request reports