Merge tag '3.1.11' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 25 Oct 2019 11:23:57 +0000 (13:23 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 25 Oct 2019 11:23:57 +0000 (13:23 +0200)

Trivial merge