Merge branch 'live'
authorThérèse Godefroy <godef.th@free.fr>
Thu, 19 Sep 2019 10:01:28 +0000 (12:01 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Thu, 19 Sep 2019 10:01:28 +0000 (12:01 +0200)

Trivial merge