Merge branch '3.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 19 Jul 2017 15:42:35 +0000 (17:42 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 19 Jul 2017 15:42:35 +0000 (17:42 +0200)

Trivial merge