Merge branch '3.3.0' into 3.4.0
authorStephane Delcroix <stephane@delcroix.org>
Thu, 18 Oct 2018 08:54:24 +0000 (10:54 +0200)
committerStephane Delcroix <stephane@delcroix.org>
Thu, 18 Oct 2018 08:54:24 +0000 (10:54 +0200)

Trivial merge