Merge branch '3.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 27 Nov 2017 18:18:32 +0000 (19:18 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 27 Nov 2017 18:18:32 +0000 (19:18 +0100)

Trivial merge