Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jean-Baptiste Le Duigou 2019-10-17 21:09:46 +02:00
commit 024c38c060
48 changed files with 12953 additions and 1083 deletions