Merge "Merge branch release-2019 into release-2020" into release-2020
authorBerk Hess <hess@kth.se>
Fri, 29 Nov 2019 16:22:15 +0000 (17:22 +0100)
committerBerk Hess <hess@kth.se>
Fri, 29 Nov 2019 16:22:15 +0000 (17:22 +0100)

Trivial merge