Merge branch '4.0.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 11 Mar 2019 08:21:07 +0000 (09:21 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 11 Mar 2019 08:21:07 +0000 (09:21 +0100)

Trivial merge