Merge branch '3.6.0' into 4.0.0
authorStephane Delcroix <stephane@delcroix.org>
Thu, 21 Mar 2019 13:37:08 +0000 (14:37 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Thu, 21 Mar 2019 13:37:08 +0000 (14:37 +0100)

Trivial merge