Merge remote-tracking branch 'origin/master' into 2.4

This commit is contained in:
Jeremy Benoist
2019-01-15 09:41:18 +01:00
61 changed files with 3813 additions and 1509 deletions

File diff suppressed because one or more lines are too long