Merge remote-tracking branch 'origin/3.0' into 3.0
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 27 Sep 2017 00:01:30 +0000 (02:01 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 27 Sep 2017 00:01:30 +0000 (02:01 +0200)

Trivial merge