Merge remote-tracking branch 'upstream/master' into patch-16

This commit is contained in:
Ranlvor 2018-07-01 16:47:49 +02:00
commit 454619974d
Signed by untrusted user who does not match committer: Ranlvor
GPG key ID: 5E12D04750EF6F8E
19 changed files with 857 additions and 538 deletions

File diff suppressed because it is too large Load diff