Merge branch 'fhgwright-fixes'
authorBenoît Fontaine <benoit.fontaine@acft.fr>
Tue, 7 Jan 2020 09:53:14 +0000 (10:53 +0100)
committerBenoît Fontaine <benoit.fontaine@acft.fr>
Tue, 7 Jan 2020 09:53:14 +0000 (10:53 +0100)

Trivial merge