Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 22 Aug 2017 10:10:12 +0000 (12:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 22 Aug 2017 10:10:12 +0000 (12:10 +0200)

Trivial merge