Merge branch '15-5'
authorStephane Delcroix <stephane@delcroix.org>
Wed, 13 Dec 2017 12:44:10 +0000 (13:44 +0100)
committerStephane Delcroix <stephane@delcroix.org>
Wed, 13 Dec 2017 12:44:10 +0000 (13:44 +0100)

Trivial merge