Merge branch '5.2'
authorTim Düsterhus <tim@bastelstu.be>
Fri, 12 Jun 2020 09:59:22 +0000 (11:59 +0200)
committerTim Düsterhus <tim@bastelstu.be>
Fri, 12 Jun 2020 09:59:22 +0000 (11:59 +0200)

Trivial merge