Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 7 Aug 2017 11:52:51 +0000 (13:52 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 7 Aug 2017 11:52:51 +0000 (13:52 +0200)

Trivial merge