Merge branch 'fa-dev'
authorThérèse Godefroy <godef.th@free.fr>
Fri, 14 Oct 2016 12:27:50 +0000 (14:27 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Fri, 14 Oct 2016 12:27:50 +0000 (14:27 +0200)

Trivial merge