Merge branch '3.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 30 Jun 2018 20:30:08 +0000 (22:30 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 30 Jun 2018 20:30:08 +0000 (22:30 +0200)

Trivial merge