Merge remote-tracking branch 'origin/master'
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Fri, 18 Jan 2019 11:37:45 +0000 (12:37 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Fri, 18 Jan 2019 11:37:45 +0000 (12:37 +0100)

Trivial merge