Merge branch '3.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 22 Aug 2017 14:18:41 +0000 (16:18 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 22 Aug 2017 14:18:41 +0000 (16:18 +0200)

Trivial merge