Merge branch 'Fabii547-patch-55' into 3.0
authorJoshua Rüsweg <josh@bastelstu.be>
Sun, 19 Aug 2018 13:33:03 +0000 (15:33 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Sun, 19 Aug 2018 13:33:03 +0000 (15:33 +0200)

Trivial merge