Merge branch 'master' into live
authorThérèse Godefroy <godef.th@free.fr>
Thu, 25 Jun 2020 09:12:12 +0000 (11:12 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Thu, 25 Jun 2020 09:12:12 +0000 (11:12 +0200)

Trivial merge