Merge branch '4.2.0'
authorStephane Delcroix <stephane@delcroix.org>
Thu, 15 Aug 2019 06:31:01 +0000 (08:31 +0200)
committerStephane Delcroix <stephane@delcroix.org>
Thu, 15 Aug 2019 06:31:01 +0000 (08:31 +0200)

Trivial merge