Merge rebased_on_upstream into master
authorStaf Verhaegen <staf@stafverhaegen.be>
Wed, 21 Apr 2021 18:23:34 +0000 (20:23 +0200)
committerStaf Verhaegen <staf@stafverhaegen.be>
Wed, 21 Apr 2021 18:23:34 +0000 (20:23 +0200)
commitf710e35307c2d06aa86c19a68b4b69afcabd03b4
tree4ff6ddfb232b8b5c7456fb74a0593e670381a362
parentce0e268991b33a8195f093ae85a961cc716f4b3b
parent091aa37324d758a1c96b15f5e5f27189fe7141c0
Merge rebased_on_upstream into master

Some commits were upstreamed and the rest was rebased on upstream master.
Then the was merged in out master to keep continuos stream of commits.