Merge branch '3.0'

Found some commits in here that weren't merged.
This commit is contained in:
Ghostkeeper 2018-01-29 09:12:59 +01:00
commit 09c7b7351a
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A

Diff Content Not Available