Merge branch '3.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 23 Jul 2017 15:16:22 +0000 (17:16 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 23 Jul 2017 15:16:22 +0000 (17:16 +0200)

Trivial merge