Merge branch '3.5.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 10 Dec 2018 07:55:42 +0000 (08:55 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 10 Dec 2018 07:55:42 +0000 (08:55 +0100)

Trivial merge