Merge branch '3.2.0'
authorStephane Delcroix <stephane@delcroix.org>
Mon, 20 Aug 2018 08:32:28 +0000 (10:32 +0200)
committerStephane Delcroix <stephane@delcroix.org>
Mon, 20 Aug 2018 08:32:28 +0000 (10:32 +0200)

Trivial merge