Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Jul 2017 07:53:33 +0000 (09:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Jul 2017 07:53:33 +0000 (09:53 +0200)

Trivial merge