Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Stephan 2018-12-21 12:31:38 +01:00
commit bf3c9f3b80
12 changed files with 2507 additions and 2361 deletions

File diff suppressed because it is too large Load diff