Merge branch '3.6.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 18 Feb 2019 08:15:37 +0000 (09:15 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 18 Feb 2019 08:15:37 +0000 (09:15 +0100)

Trivial merge