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

This commit is contained in:
Jeremy Benoist
2019-05-15 14:38:07 +02:00
26 changed files with 253 additions and 64 deletions

File diff suppressed because one or more lines are too long